Layout, couple fixes