Removed some unnecessary element due to flexbox