UI adjustments, minor improvements and stuff