Cleaned up menus and started reworking plugin system