some changes to implement correctly on phone view