Layout finished
Reverting changes to layout