fixed explore and current button
merged with wills changes