Fits design completely, more progress on GUI