Fixed flexbox and some other minor CSS issues