Visual improvements and some functionality