Add more options and make sure it rotates nicely