Added up and down logic and added some better look