added includes
replaced large div blocks by includes