Up/Down functionality

Made up/down functionality more logical