Eliminated unneccessary linear layout