Fix merge breaks, update css