CSS Cleanup
Added correct html structure