added strings, changed px to dp