added a bit of layouting