Little Base Class updates

Most updates refer to gui and container things