Modified layout to my liking and did some organizational changes