Solved minor bugs and made some little changes to display + ready for production