Fixed Complete UI