Refactoring, added tooltips and logged in status circle