Update Content + Improve Design