Work on layout, fixing a few buttons, more placeholder behaviours