Some work done on the MainActivity layout