Button visuals added
More work on visibility