modularized layout, added components
tweaks
silence debugging a bit
cleanup