Refactor old and added Placeholder for GUI