Cleaned up patient model and view code; now using only user's measures