Revamping GUI