Added very simple implementation of hidden elements, something better needs to be done.