Replaced surfaces with ButtonViews