Updated px into dp
Autoformat + comments