DM added hotbar, cleaned up code a bit