Layout

Realign Elements

closes #52