MODIFIED: onClick to be linked through xml

Also, some minor changes to the layout apperance.
MODIFIED: onClick to be linked through xml.

Also, made some minior changes to the layout.
MODIFIED: onClick to be linked through the xml.