Continued working on GUI components