Bug fixes

BSM logo multiple in login
Some back button issues