fixed swiping
some layout fixes, making it prettier