renamed some variables and layout edits