merge with my bootstrap-less version