Updated some hardcoded values

Undid some ghetto rigging for the beta prototype
Still needs a plan for hardcoded values but I'm not familiar enough with
android.