Finalizing interface layout

Continue to refine interface layout