Update design

Change size, locations, alingment