New design taken further + some moar bug fixes