Switched to clearer view constants and added frame margin