Frtizing design updates

Added labels for most components. Adjusted layout slightly to fit.