Updated some old code and made a new layout