Adding more smart GUI logic