Refactoring and further adding on to drawer logic and layout