Fixed button listeners. And reorganized to have more specific methods
for showing views