Initial layout finished

^^^^