Fix design a bit
Fix enqueue User Interface