Progress

basic layout adjustments