Updated to flat layout