Various GUI additions and modifications