Refactored + some bugs fixed + new admin_bar feature