Finishing up civvy redesign

fixes according to user complaints