Fixed positioning and added pretties