Fixed notable and not showcase bug and simplified button logic