Feature/#555 ipad style