Added columns to users + more css/html changes