changes to gui + finish security on current stage