General UI Development

Fixes and bugs