removed swiping, misc gui-fixes