Finished refactor of left and right components