Fixed overlapping icons and issues on phone