Added top input and cleaned up axis and container.