Changed all px to dp