Fixed topbar alignment and added analytics