GUI improvements and small code changes