Minor fixes in gui scaling and cleanup.