debugging + minor css changes
fixed merge