added customised icon, rearranged top bar menu and functions