Removed CSS and moved includes