Add drawable shapes
Menu work, most of it is working okay now