Fixed spacing and added more options
Update