Custom controller works, but does not look nice