Few Fixes, one page to test things