GUI improvements and additional features