Added more content & cleaned up UI