Fixed layout/reponsiveness issues