Add some new atoms and layout