Bug/Layout fixes from User Testing