Bug Fixes & New Modules

Added new modules and fixed the logout.