first commit, still has issue with layout