Removed some unneeded code. Cleaned up XML layout.