Various changes for propper presentation