Final tweeks
Style
UI change