Added notification toggling and fixed back icon