Changed base layout to linear layout