Mainly changes to layout-files and making activities for layouts