Fixed GUI component IDs in activity
General formatting of code