Update components to be more streamlined

Follow approach from !33 (closed)