UI Changes
Some bug fixes