Add save preference button
Minor UI fixes