Fix some issues
Done fixing
Done with some fix with design issues