better layout, working on auto layout now