Updated drawables and reformatted code