Further organization and CSS improvements