Removed uselesscode for Xperia's and clean-up of UI