restructure CSS to prepare for #3