Code optimized
Final cleanup
Some unfinished changes to flexbox css