cleaned up ui and structure