Bug on reveleable elements. This really needs a cleaner JS