Added and completed GUI todo